Fix Issue #230 - Humans' Hostility does not consistently trigger #231
Open
crkellen wants to merge 5 commits intoTurningWheel:barony-nextfrom
Open
Fix Issue #230 - Humans' Hostility does not consistently trigger #231crkellen wants to merge 5 commits intoTurningWheel:barony-nextfrom
crkellen wants to merge 5 commits intoTurningWheel:barony-nextfrom
Conversation
added 5 commits
November 7, 2017 16:55
Collaborator
|
Could you do a quick pull from the barony-next branch to try get this up to date? Hopefully it'll sort out any conflicts. |
Contributor
Author
|
Yes, I can update this and see what I can do.
null
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a fix for #230.
The issue is the same as #229, but not as easily solved as Humans can become Followers, and don't change the
swornenemies[][]array. A similar solution was taken to solve this issue. However, there is still one issue left:Due to the "Call Allies to Aid" functionality, Followers of a Player that attacks a Human will also become aggressive against that Player. The changes in this PR however do successfully remove the Player from the 'FOLLOWING' list.